From: Alban Browaeys <prahal@yahoo.com>
Date: Sun, 20 May 2012 21:37:22 +0000 (+0200)
Subject: popupMenu: bypass changeSignal callback if action is already handled
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6512
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=cc9d53e038097e8f3de31d7f9646a768f1692bc4;p=gnome-shell.git

popupMenu: bypass changeSignal callback if action is already handled

https://bugzilla.gnome.org/show_bug.cgi?id=676447
---

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 35843d901..368442db4 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1961,8 +1961,9 @@ const RemoteMenu = new Lang.Class({
                     k++;
                 }
             } else if (changeSignal) {
-                let signalId = this.actionGroup.connect(changeSignal, Lang.bind(this, function() {
-                    this.actionGroup.disconnect(signalId);
+                let signalId = this.actionGroup.connect(changeSignal, Lang.bind(this, function(actionGroup, actionName) {
+                    actionGroup.disconnect(signalId);
+                    if (this._actions[actionName]) return;
 
                     // force a full update
                     this._modelChanged(model, 0, -1, model.get_n_items(), target);